From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Fri, 4 Jan 2019 09:17:43 +0000 (+0100)
Subject: type parentheses
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~7^2~2^2~11
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=3dab4a022132964d5676c092e6e546719cdb8252;p=siridb-server.git

type parentheses
---

diff --git a/grammar/grammar.py b/grammar/grammar.py
index f06e6e93..47152d6c 100644
--- a/grammar/grammar.py
+++ b/grammar/grammar.py
@@ -414,7 +414,7 @@ class SiriGrammar(Grammar):
         k_symmetric_difference,
         most_greedy=False)
 
-    series_parenthesis = Sequence('(', THIS, ')')
+    series_parentheses = Sequence('(', THIS, ')')
 
     series_all = Choice(Token('*'), k_all, most_greedy=False)
     series_name = Repeat(string, 1, 1)
@@ -429,7 +429,7 @@ class SiriGrammar(Grammar):
             group_match,
             series_re,
             most_greedy=False),
-        series_parenthesis,
+        series_parentheses,
         Sequence(THIS, series_setopr, THIS),
     )
 
diff --git a/include/siri/grammar/grammar.h b/include/siri/grammar/grammar.h
index bf0aa4f1..b4d098b6 100644
--- a/include/siri/grammar/grammar.h
+++ b/include/siri/grammar/grammar.h
@@ -275,7 +275,7 @@ enum cleri_grammar_ids {
     CLERI_GID_SERIES_COLUMNS,
     CLERI_GID_SERIES_MATCH,
     CLERI_GID_SERIES_NAME,
-    CLERI_GID_SERIES_PARENTHESIS,
+    CLERI_GID_SERIES_PARENTHESES,
     CLERI_GID_SERIES_RE,
     CLERI_GID_SERIES_SETOPR,
     CLERI_GID_SERVER_COLUMNS,
diff --git a/src/siri/db/listener.c b/src/siri/db/listener.c
index b74c9f54..a5be32a8 100644
--- a/src/siri/db/listener.c
+++ b/src/siri/db/listener.c
@@ -202,7 +202,7 @@ static void enter_set_password(uv_async_t * handle);
 static void enter_series_all(uv_async_t * handle);
 static void enter_series_name(uv_async_t * handle);
 static void enter_series_match(uv_async_t * handle);
-static void enter_series_parenthesis(uv_async_t * handle);
+static void enter_series_parentheses(uv_async_t * handle);
 static void enter_series_re(uv_async_t * handle);
 static void enter_series_setopr(uv_async_t * handle);
 static void enter_timeit_stmt(uv_async_t * handle);
@@ -244,7 +244,7 @@ static void exit_revoke_user(uv_async_t * handle);
 static void exit_select_aggregate(uv_async_t * handle);
 static void exit_select_stmt(uv_async_t * handle);
 static void exit_series_match(uv_async_t * handle);
-static void exit_series_parenthesis(uv_async_t * handle);
+static void exit_series_parentheses(uv_async_t * handle);
 static void exit_set_address(uv_async_t * handle);
 static void exit_set_backup_mode(uv_async_t * handle);
 static void exit_set_drop_threshold(uv_async_t * handle);
@@ -431,7 +431,7 @@ void siridb_init_listener(void)
     siridb_listen_enter[CLERI_GID_SERIES_ALL] = enter_series_all;
     siridb_listen_enter[CLERI_GID_SERIES_NAME] = enter_series_name;
     siridb_listen_enter[CLERI_GID_SERIES_MATCH] = enter_series_match;
-    siridb_listen_enter[CLERI_GID_SERIES_PARENTHESIS] = enter_series_parenthesis;
+    siridb_listen_enter[CLERI_GID_SERIES_PARENTHESES] = enter_series_parentheses;
     siridb_listen_enter[CLERI_GID_SERIES_RE] = enter_series_re;
     siridb_listen_enter[CLERI_GID_SERIES_SETOPR] = enter_series_setopr;
     siridb_listen_enter[CLERI_GID_SHARD_COLUMNS] = enter_xxx_columns;
@@ -479,7 +479,7 @@ void siridb_init_listener(void)
     siridb_listen_exit[CLERI_GID_SELECT_AGGREGATE] = exit_select_aggregate;
     siridb_listen_exit[CLERI_GID_SELECT_STMT] = exit_select_stmt;
     siridb_listen_exit[CLERI_GID_SERIES_MATCH] = exit_series_match;
-    siridb_listen_exit[CLERI_GID_SERIES_PARENTHESIS] = exit_series_parenthesis;
+    siridb_listen_exit[CLERI_GID_SERIES_PARENTHESES] = exit_series_parentheses;
     siridb_listen_exit[CLERI_GID_SET_ADDRESS] = exit_set_address;
     siridb_listen_exit[CLERI_GID_SET_BACKUP_MODE] = exit_set_backup_mode;
     siridb_listen_exit[CLERI_GID_SET_DROP_THRESHOLD] = exit_set_drop_threshold;
@@ -1318,7 +1318,7 @@ static void enter_series_match(uv_async_t * handle)
     SIRIPARSER_NEXT_NODE
 }
 
-static void enter_series_parenthesis(uv_async_t * handle)
+static void enter_series_parentheses(uv_async_t * handle)
 {
     siridb_query_t * query = handle->data;
     query_wrapper_t * q_wrapper = query->data;
@@ -3336,7 +3336,7 @@ static void exit_series_match(uv_async_t * handle)
     SIRIPARSER_ASYNC_NEXT_NODE
 }
 
-static void exit_series_parenthesis(uv_async_t * handle)
+static void exit_series_parentheses(uv_async_t * handle)
 {
     siridb_query_t * query = handle->data;
     query_wrapper_t * q_wrapper = query->data;
diff --git a/src/siri/grammar/grammar.c b/src/siri/grammar/grammar.c
index 27de5ce9..305d4c6d 100644
--- a/src/siri/grammar/grammar.c
+++ b/src/siri/grammar/grammar.c
@@ -754,8 +754,8 @@ cleri_grammar_t * compile_siri_grammar_grammar(void)
         k_intersection,
         k_symmetric_difference
     );
-    cleri_t * series_parenthesis = cleri_sequence(
-        CLERI_GID_SERIES_PARENTHESIS,
+    cleri_t * series_parentheses = cleri_sequence(
+        CLERI_GID_SERIES_PARENTHESES,
         3,
         cleri_token(CLERI_NONE, "("),
         CLERI_THIS,
@@ -791,7 +791,7 @@ cleri_grammar_t * compile_siri_grammar_grammar(void)
             group_match,
             series_re
         ),
-        series_parenthesis,
+        series_parentheses,
         cleri_sequence(
             CLERI_NONE,
             3,